Revision: bazaar--messages--1.4--patch-6
Archive: Matthieu.Moy@imag.fr--public
Creator: Matthieu Moy <Matthieu.Moy@imag.fr>
Date: Thu May 19 15:48:23 MEST 2005
Standard-date: 2005-05-19 13:48:23 GMT
Modified-files: commands/add-log-version.c
    commands/add-pristine.c commands/ancestry-graph.c
    commands/ancestry.c commands/annotate.c
    commands/apply-delta.c commands/archive-mirror.c
    commands/branch.c commands/build-config.c
    commands/cacherev.c commands/cat-config.c
    commands/cmdutils.c commands/cmdutils.h
    commands/commit.c commands/delta.c commands/diff.c
    commands/find-pristine.c commands/get.c commands/grab.c
    commands/import.c commands/init-tree.c
    commands/lock-pristine.c commands/merge.c
    commands/replay.c commands/resolved.c commands/status.c
    commands/switch.c commands/sync-tree.c
    commands/tree-version.c commands/undo.c
    commands/update.c libarch/apply-changeset.c
    libarch/apply-changeset.h libarch/archive-cache.c
    libarch/archive-cache.h libarch/authinfo.c
    libarch/build-revision.c libarch/build-revision.h
    libarch/changeset-utils.h libarch/commit.c
    libarch/configs.c libarch/configs.h
    libarch/conflict-handling.c libarch/conflict-handling.h
    libarch/file-diffs.c libarch/import.c
    libarch/inode-sig.c libarch/inode-sig.h
    libarch/libraries.c libarch/libraries.h
    libarch/library-txn.c libarch/local-cache.c
    libarch/local-cache.h libarch/merge-three-way.c
    libarch/merge.c libarch/merge.h libarch/pristines.c
    libarch/pristines.h libarch/project-tree.c
    libarch/project-tree.h libarch/sync-tree.c
    libarch/sync-tree.h libarch/tag.c
    libarch/tests/unit-pfs-dav.c libarch/undo.c
    libawk/relational.c libawk/relational.h
New-patches: Matthieu.Moy@imag.fr--public/bazaar--archive-mirror--1.4--patch-1
    Matthieu.Moy@imag.fr--public/bazaar--archive-mirror-req--1.4--base-0
    Matthieu.Moy@imag.fr--public/bazaar--archive-mirror-req--1.4--patch-1
    Matthieu.Moy@imag.fr--public/bazaar--authinfo--1.4--patch-3
    Matthieu.Moy@imag.fr--public/bazaar--authinfo--1.4--patch-6
    Matthieu.Moy@imag.fr--public/bazaar--authinfo-nopass--1.4--base-0
    Matthieu.Moy@imag.fr--public/bazaar--authinfo-nopass--1.4--patch-1
    Matthieu.Moy@imag.fr--public/bazaar--authinfo-nopass--1.4--patch-2
    Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-6
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-80
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-81
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-82
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-83
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-84
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-85
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-86
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-87
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-88
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-89
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-9
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-10
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-11
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-12
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-13
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-14
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-15
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-16
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-17
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-18
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-19
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-20
    thelove@canonical.com/bazaar--devo--1.4--patch-49
    thelove@canonical.com/bazaar--devo--1.4--patch-50
    thelove@canonical.com/bazaar--devo--1.4--patch-51
    thelove@canonical.com/bazaar--devo--1.4--patch-52
    thelove@canonical.com/bazaar--devo--1.4--patch-53
    thelove@canonical.com/bazaar--devo--1.4--patch-54
    thelove@canonical.com/bazaar--devo--1.4--patch-55
    thelove@canonical.com/bazaar--devo--1.4--patch-56
    thelove@canonical.com/bazaar--devo--1.4--patch-57
Summary: Merge from uptream
Keywords: 

Patches applied:

 * Matthieu.Moy@imag.fr--public/bazaar--archive-mirror--1.4--patch-1
   bugfix: baz archive-mirror -a with several archives reported archive corruption

 * Matthieu.Moy@imag.fr--public/bazaar--archive-mirror-req--1.4--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-50

 * Matthieu.Moy@imag.fr--public/bazaar--archive-mirror-req--1.4--patch-1
   bugfix: baz archive-mirror -a with several archives reported archive corruption

 * Matthieu.Moy@imag.fr--public/bazaar--authinfo--1.4--patch-3
   .authinfo parser accepts lines without password field

 * Matthieu.Moy@imag.fr--public/bazaar--authinfo--1.4--patch-6
   Using NULL not allowed in rel_make_record. Use "" instead.

 * Matthieu.Moy@imag.fr--public/bazaar--authinfo-nopass--1.4--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-50

 * Matthieu.Moy@imag.fr--public/bazaar--authinfo-nopass--1.4--patch-1
   .authinfo parser accepts lines without password field (tests fail)

 * Matthieu.Moy@imag.fr--public/bazaar--authinfo-nopass--1.4--patch-2
   Modified tests, fixed a bug in authinfo parsing.

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-80
   more code duplication elimination in apply_changest, and cleanup the apply_changeset interface to conflicts to use the tree objects

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-81
   major sweep of char tree_root usage, cleaning it into typesafe arch_project_tree_t usage. Also cripple/partially remove the search-peer-directories cache facility which has caused so many user headaches

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-82
   in apply-changeset, nuke single letter r variable and make it part of the apply state

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-83
   factor out changeset evaluation in apply-changeset

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-84
   overhaul callback usage in apply-changeset

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-85
   more apply-changeset cleanups and rationalisaiton

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-86
   merge from thelove

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-87
   talloc-manage the records in rel_tables

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-88
   merge from -mac

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-89
   merge from thelove

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-9
   merge from thelove

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-10
   finalize_library_revision tidyup

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-11
   builder.c: add_to_library api cleanup

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-12
   arch_set_tree_version api update

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-13
   update arch_snap_inode_sig to use patch ids

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-14
   arch_library_revision_dir_in_lib api update to use patch ids

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-15
   replace i with patch_index in apply_revisions, and eliminate temp target_revision for a single if where it was used

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-16
   arch_build_library_revision to using patch_ids

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-17
   make_patch_list should return an ar_patch_id rather than take an output rel_table

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-18
   remove temp my_archive and my_revision in build_revision for shorter scope my_patch

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-19
   teach find_prev_revision about patch ids for the local revision parameter

 * robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-20
   nuke all direct uses of archive/revision in find_patch_lists

 * thelove@canonical.com/bazaar--devo--1.4--patch-49
   major sweep of char tree_root usage, cleaning it into typesafe arch_project_tree_t usage. Also cripple/partially remove the search-peer-directories cache facility which has caused so many user headaches

 * thelove@canonical.com/bazaar--devo--1.4--patch-50
   Various output message trivial fixes

 * thelove@canonical.com/bazaar--devo--1.4--patch-51
   bugfix: baz archive-mirror -a with several archives reported archive corruption

 * thelove@canonical.com/bazaar--devo--1.4--patch-52
   Accept lines without password in ~/.authinfo

 * thelove@canonical.com/bazaar--devo--1.4--patch-53
   apply-changeset internal cleanups and duplicate code removal

 * thelove@canonical.com/bazaar--devo--1.4--patch-54
   Output messages improvements

 * thelove@canonical.com/bazaar--devo--1.4--patch-55
   --conflicted option for status

 * thelove@canonical.com/bazaar--devo--1.4--patch-56
   much apply-changeset api and api usage cleanups to be patch-id based - snapshotting stable iteration

 * thelove@canonical.com/bazaar--devo--1.4--patch-57
   (trivial) space before "done" in an output message

